Merge branch 'master.win32' into 'master'
authorMatthias Clasen <mclasen@redhat.com>
Tue, 15 Sep 2020 11:12:27 +0000 (11:12 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 15 Sep 2020 11:12:27 +0000 (11:12 +0000)
Some more fixes for Windows

Closes #3157

See merge request GNOME/gtk!2580


Trivial merge